Merge "Add option to fail when Android.mk files change PRODUCT_* variables."