Merge "Build HalProxy unit tests with a test library ScopedWakelock" into...
Merge "Build HalProxy unit tests with a test library ScopedWakelock" into rvc-dev am: 89fe7456 am: 26f27e05 am: 5dac4c46
Change-Id: Ia315a0ee757d46d4a6934f0165f4c286dd2c5c24