Merge "Regenerate init.environ.rc if PRODUCT_BOOTCLASSPATH changed."