[automerger skipped] Merge "Use bionic platform headers." am: 539d37679c am: 36469ac071 am: bf6df9ed52
am: c72a04529d -s ours
am skip reason: change_id Ieed72d4e15c0ce0dfc3a4f3383ea6563905bc236 with SHA1 8269f3a377 is in history

Change-Id: I074f4d23780bca4166c651faa4c4a97b924be177