Merge "Add prebuilt_etc for go_handheld_core_hardware.xml"