Merge remote-tracking branch 'origin/sm7225_r_fp4' into fp4-r-rebase

Change-Id: If3442ebbf16064447cc881e672703a13d9a6e7d5
diff --git a/1.2/Android.bp b/1.2/Android.bp.bak
similarity index 100%
rename from 1.2/Android.bp
rename to 1.2/Android.bp.bak