Merge "Use ro.build.type instead of ro.debuggable" am: 8ab7ab147c

Original change: https://android-review.googlesource.com/c/platform/bionic/+/1728690

Change-Id: Id3d8c0f92a7b6644b143196c6d6effc87faf518c