am e12a2a47: Merge "Disable CameraServiceTest in a normal build." into kraken
am e12a2a47: Merge "Disable CameraServiceTest in a normal build." into kraken

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base