Revert submission

Based on Forrest run with earlier base build 6069142, the build with this submission failed apct/bluetooth/instrumentation_test 

Reason for revert: Break tests

Change-Id: Ie35f3a85f02c7abb111ab15b063214c529c446fe
17 files changed