deleted:    Android.mk
	new file:   product/google.mk
	new file:   proprietary/Android.mk
	renamed:    system/app/FaceLock.apk -> proprietary/common/app/FaceLock.apk
	renamed:    system/app/GenieWidget.apk -> proprietary/common/app/GenieWidget.apk
	renamed:    system/app/Gmail2.apk -> proprietary/common/app/Gmail2.apk
	renamed:    system/app/GoogleContactsSyncAdapter.apk -> proprietary/common/app/GoogleContactsSyncAdapter.apk
	renamed:    system/app/GoogleEars.apk -> proprietary/common/app/GoogleEars.apk
	renamed:    system/app/GoogleTTS.apk -> proprietary/common/app/GoogleTTS.apk
	renamed:    system/app/LatinImeGoogle.apk -> proprietary/common/app/LatinImeGoogle.apk
	renamed:    system/app/MediaUploader.apk -> proprietary/common/app/MediaUploader.apk
	renamed:    system/app/Phonesky.apk -> proprietary/common/app/Phonesky.apk
	renamed:    system/app/PlusOne.apk -> proprietary/common/app/PlusOne.apk
	renamed:    system/app/SetupWizard.apk -> proprietary/common/app/SetupWizard.apk
	renamed:    system/app/Velvet.apk -> proprietary/common/app/Velvet.apk
	renamed:    system/app/talkback.apk -> proprietary/common/app/talkback.apk
	renamed:    system/etc/g.prop -> proprietary/common/etc/g.prop
	renamed:    system/etc/permissions/com.google.android.maps.xml -> proprietary/common/etc/permissions/com.google.android.maps.xml
	renamed:    system/etc/permissions/com.google.android.media.effects.xml -> proprietary/common/etc/permissions/com.google.android.media.effects.xml
	renamed:    system/etc/permissions/com.google.widevine.software.drm.xml -> proprietary/common/etc/permissions/com.google.widevine.software.drm.xml
	renamed:    system/etc/permissions/features.xml -> proprietary/common/etc/permissions/features.xml
	renamed:    system/etc/preferred-apps/google.xml -> proprietary/common/etc/preferred-apps/google.xml
	new file:   proprietary/common/etc/updatecmds/google_generic_update.txt
	renamed:    system/framework/com.google.android.maps.jar -> proprietary/common/framework/com.google.android.maps.jar
	renamed:    system/framework/com.google.android.media.effects.jar -> proprietary/common/framework/com.google.android.media.effects.jar
	renamed:    system/framework/com.google.widevine.software.drm.jar -> proprietary/common/framework/com.google.widevine.software.drm.jar
	renamed:    system/lib/libAppDataSearch.so -> proprietary/common/lib/libAppDataSearch.so
	renamed:    system/lib/libRSSupport.so -> proprietary/common/lib/libRSSupport.so
	renamed:    system/lib/libfacelock_jni.so -> proprietary/common/lib/libfacelock_jni.so
	renamed:    system/lib/libfilterpack_facedetect.so -> proprietary/common/lib/libfilterpack_facedetect.so
	renamed:    system/lib/libfrsdk.so -> proprietary/common/lib/libfrsdk.so
	renamed:    system/lib/libgames_rtmp_jni.so -> proprietary/common/lib/libgames_rtmp_jni.so
	renamed:    system/lib/libgoogle_recognizer_jni_l.so -> proprietary/common/lib/libgoogle_recognizer_jni_l.so
	renamed:    system/lib/libgtalk_jni.so -> proprietary/common/lib/libgtalk_jni.so
	renamed:    system/lib/libgtalk_stabilize.so -> proprietary/common/lib/libgtalk_stabilize.so
	renamed:    system/lib/libjni_latinime.so -> proprietary/common/lib/libjni_latinime.so
	renamed:    system/lib/libjni_t13n_shared_engine.so -> proprietary/common/lib/libjni_t13n_shared_engine.so
	renamed:    system/lib/libpatts_engine_jni_api.so -> proprietary/common/lib/libpatts_engine_jni_api.so
	renamed:    system/lib/libplus_jni_v8.so -> proprietary/common/lib/libplus_jni_v8.so
	renamed:    system/lib/librs.antblur.so -> proprietary/common/lib/librs.antblur.so
	renamed:    system/lib/librs.antblur_constant.so -> proprietary/common/lib/librs.antblur_constant.so
	renamed:    system/lib/librs.antblur_drama.so -> proprietary/common/lib/librs.antblur_drama.so
	renamed:    system/lib/librs.drama.so -> proprietary/common/lib/librs.drama.so
	renamed:    system/lib/librs.film_base.so -> proprietary/common/lib/librs.film_base.so
	renamed:    system/lib/librs.fixedframe.so -> proprietary/common/lib/librs.fixedframe.so
	renamed:    system/lib/librs.grey.so -> proprietary/common/lib/librs.grey.so
	renamed:    system/lib/librs.image_wrapper.so -> proprietary/common/lib/librs.image_wrapper.so
	renamed:    system/lib/librs.retrolux.so -> proprietary/common/lib/librs.retrolux.so
	renamed:    system/lib/librsjni.so -> proprietary/common/lib/librsjni.so
	renamed:    system/lib/libspeexwrapper.so -> proprietary/common/lib/libspeexwrapper.so
	renamed:    system/lib/libvcdecoder_jni.so -> proprietary/common/lib/libvcdecoder_jni.so
	renamed:    system/lib/libvorbisencoder.so -> proprietary/common/lib/libvorbisencoder.so
	renamed:    system/lib/libwebp_android.so -> proprietary/common/lib/libwebp_android.so
	renamed:    system/lib/libwebrtc_audio_coding.so -> proprietary/common/lib/libwebrtc_audio_coding.so
	renamed:    system/priv-app/ConfigUpdater.apk -> proprietary/common/priv-app/ConfigUpdater.apk
	renamed:    system/priv-app/GoogleBackupTransport.apk -> proprietary/common/priv-app/GoogleBackupTransport.apk
	renamed:    system/priv-app/GoogleFeedback.apk -> proprietary/common/priv-app/GoogleFeedback.apk
	renamed:    system/priv-app/GoogleLoginService.apk -> proprietary/common/priv-app/GoogleLoginService.apk
	renamed:    system/priv-app/GoogleOneTimeInitializer.apk -> proprietary/common/priv-app/GoogleOneTimeInitializer.apk
	renamed:    system/priv-app/GooglePartnerSetup.apk -> proprietary/common/priv-app/GooglePartnerSetup.apk
	renamed:    system/priv-app/GoogleServicesFramework.apk -> proprietary/common/priv-app/GoogleServicesFramework.apk
	renamed:    system/priv-app/Phonesky.apk -> proprietary/common/priv-app/Phonesky.apk
	renamed:    system/priv-app/PrebuiltGmsCore.apk -> proprietary/common/priv-app/PrebuiltGmsCore.apk
	renamed:    system/priv-app/SetupWizard.apk -> proprietary/common/priv-app/SetupWizard.apk
	renamed:    system/priv-app/Velvet.apk -> proprietary/common/priv-app/Velvet.apk
	renamed:    system/priv-app/talkback.apk -> proprietary/common/priv-app/talkback.apk
	renamed:    system/usr/srec/en-US/c_fst -> proprietary/common/usr/srec/en-US/c_fst
	renamed:    system/usr/srec/en-US/clg -> proprietary/common/usr/srec/en-US/clg
	renamed:    system/usr/srec/en-US/commands.abnf -> proprietary/common/usr/srec/en-US/commands.abnf
	renamed:    system/usr/srec/en-US/compile_grammar.config -> proprietary/common/usr/srec/en-US/compile_grammar.config
	renamed:    system/usr/srec/en-US/contacts.abnf -> proprietary/common/usr/srec/en-US/contacts.abnf
	renamed:    system/usr/srec/en-US/dict -> proprietary/common/usr/srec/en-US/dict
	renamed:    system/usr/srec/en-US/dictation.config -> proprietary/common/usr/srec/en-US/dictation.config
	renamed:    system/usr/srec/en-US/dnn -> proprietary/common/usr/srec/en-US/dnn
	renamed:    system/usr/srec/en-US/endpointer_dictation.config -> proprietary/common/usr/srec/en-US/endpointer_dictation.config
	renamed:    system/usr/srec/en-US/endpointer_voicesearch.config -> proprietary/common/usr/srec/en-US/endpointer_voicesearch.config
	renamed:    system/usr/srec/en-US/ep_acoustic_model -> proprietary/common/usr/srec/en-US/ep_acoustic_model
	renamed:    system/usr/srec/en-US/g2p_fst -> proprietary/common/usr/srec/en-US/g2p_fst
	renamed:    system/usr/srec/en-US/grammar.config -> proprietary/common/usr/srec/en-US/grammar.config
	renamed:    system/usr/srec/en-US/hclg_shotword -> proprietary/common/usr/srec/en-US/hclg_shotword
	renamed:    system/usr/srec/en-US/hmm_symbols -> proprietary/common/usr/srec/en-US/hmm_symbols
	renamed:    system/usr/srec/en-US/hmmlist -> proprietary/common/usr/srec/en-US/hmmlist
	renamed:    system/usr/srec/en-US/hotword.config -> proprietary/common/usr/srec/en-US/hotword.config
	renamed:    system/usr/srec/en-US/hotword_classifier -> proprietary/common/usr/srec/en-US/hotword_classifier
	renamed:    system/usr/srec/en-US/hotword_normalizer -> proprietary/common/usr/srec/en-US/hotword_normalizer
	renamed:    system/usr/srec/en-US/hotword_prompt.txt -> proprietary/common/usr/srec/en-US/hotword_prompt.txt
	renamed:    system/usr/srec/en-US/hotword_word_symbols -> proprietary/common/usr/srec/en-US/hotword_word_symbols
	renamed:    system/usr/srec/en-US/metadata -> proprietary/common/usr/srec/en-US/metadata
	renamed:    system/usr/srec/en-US/norm_fst -> proprietary/common/usr/srec/en-US/norm_fst
	renamed:    system/usr/srec/en-US/normalizer -> proprietary/common/usr/srec/en-US/normalizer
	renamed:    system/usr/srec/en-US/offensive_word_normalizer -> proprietary/common/usr/srec/en-US/offensive_word_normalizer
	renamed:    system/usr/srec/en-US/phone_state_map -> proprietary/common/usr/srec/en-US/phone_state_map
	renamed:    system/usr/srec/en-US/phonelist -> proprietary/common/usr/srec/en-US/phonelist
	renamed:    system/usr/srec/en-US/rescoring_lm -> proprietary/common/usr/srec/en-US/rescoring_lm
	renamed:    system/usr/srec/en-US/wordlist -> proprietary/common/usr/srec/en-US/wordlist
	renamed:    system/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.7/left_eye-y0-yi45-p0-pi45-r0-ri20.lg_32.bin -> proprietary/common/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.7/left_eye-y0-yi45-p0-pi45-r0-ri20.lg_32.bin
	renamed:    system/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.7/nose_base-y0-yi45-p0-pi45-r0-ri20.lg_32.bin -> proprietary/common/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.7/nose_base-y0-yi45-p0-pi45-r0-ri20.lg_32.bin
	renamed:    system/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.7/right_eye-y0-yi45-p0-pi45-r0-ri20.lg_32-2.bin -> proprietary/common/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.7/right_eye-y0-yi45-p0-pi45-r0-ri20.lg_32-2.bin
	renamed:    system/vendor/pittpatt/models/detection/yaw_roll_face_detectors.6/head-y0-yi45-p0-pi45-r0-ri30.4a-v24.bin -> proprietary/common/vendor/pittpatt/models/detection/yaw_roll_face_detectors.6/head-y0-yi45-p0-pi45-r0-ri30.4a-v24.bin
	renamed:    system/vendor/pittpatt/models/detection/yaw_roll_face_detectors.6/head-y0-yi45-p0-pi45-rn30-ri30.5-v24.bin -> proprietary/common/vendor/pittpatt/models/detection/yaw_roll_face_detectors.6/head-y0-yi45-p0-pi45-rn30-ri30.5-v24.bin
	renamed:    system/vendor/pittpatt/models/detection/yaw_roll_face_detectors.6/head-y0-yi45-p0-pi45-rp30-ri30.5-v24.bin -> proprietary/common/vendor/pittpatt/models/detection/yaw_roll_face_detectors.6/head-y0-yi45-p0-pi45-rp30-ri30.5-v24.bin
	renamed:    system/vendor/pittpatt/models/recognition/face.face.y0-y0-22-b-N.bin -> proprietary/common/vendor/pittpatt/models/recognition/face.face.y0-y0-22-b-N.bin