Merge master@5428150 into git_qt-dev-plus-aosp.

Change-Id: I8448336664317444b37ea214b0daceddb66ef663
BUG: 129345239
tree: 54563442b76b4bded41d5d8b7dcbbd9d98749b8a
  1. .prebuilt_info/
  2. debug/
  3. Image.lz4-dtb