Merge "Use ro.debuggable property instead of checking build type" am: d6084a76 am: fd38bdf0 am: 2be81d77 am: eea80cd8 Change-Id: Ideeaf47704a17b5e4a29119e624540df1895cce6