Merge remote-tracking branch 'aosp/upstream-android_layers' into 20161108-merge-android_layers_to_master