Merge "Convert  system/timezone/output_data/android/Android.mk to Android.bp."
am: f4c91ec276

Change-Id: Idc56a437b9b63caf94598ceac997dd2bb9cec499