Move remount to PRODUCT_PACKAGES_DEBUG. am: 6ce44041b5
am: 7fc8e46ddd

Change-Id: Ia4f32e1ced69f562f49f122ccae27c310a3dec54