Merge "Android.mk should not reference out/" into mnc-dev