Merge "Convert system/timezone/output_data/iana/Android.mk to Android.bp." am: b62b9651f9
am: c1c7ce8dab

Change-Id: I9f95a6fc63f6879c6cbf38f4d010e9a38ff42f3a