[automerger skipped] Revert^2 "Build libgptutils with Android.bp."" am: bf908c1699
am: af67a0c9d1 -s ours
am skip reason: change_id I4a7c4cedcf58c7735172d989912e4f7afad1eaed with SHA1 d225ec4e60 is in history

Change-Id: I96346c3903ff552eae8d6ccf41a8b3e9b2f7d450