Merge remote-tracking branch 'aosp/upstream-android_layers' into 20161108-merge-android_layers_to_master am: 9a4ddc16e8 am: 612b978e93 am: 11fd7322a0
am: e4d30432c5

Change-Id: I9ab4a7e6d49ea93eb7d7b308fe38e913cf0d3f80