Merge "Convert system/timezone/output_data/iana/Android.mk to Android.bp."