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

Change-Id: Ib797f4230eb6664d4886506e405d2cd991ae3d01