Merge "Snap for 4965753 from 59cd8237 to...

adb/Android.bp

adb/daemon/services.cpp

fastboot/device/variables.cpp

fs_mgr/Android.bp

healthd/healthd_draw.cpp

healthd/healthd_mode_charger.cpp

init/Android.mk

init/reboot.cpp

libsuspend/Android.bp

libutils/Unicode.cpp

libutils/include/utils/StrongPointer.h

libutils/include/utils/Unicode.h

lmkd/lmkd.c

rootdir/etc/OWNERS

rootdir/etc/ld.config.txt

rootdir/update_and_install_ld_config.mk

trusty/keymaster/3.0/TrustyKeymaster3Device.cpp

...ster/3.0/android.hardware.keymaster@3.0-service.trusty.rc

trusty/keymaster/3.0/service.cpp

trusty/keymaster/Android.bp