Merge "Verify PRODUCT_* are not modified by Android.mks, but allow them to be read only."