Merge "Build: Add ART_BOOT_IMAGE_EXTRA_ARGS" am: 8a547f1
am: c0f254a

* commit 'c0f254a5b9710f459fba044530bace0c4bb107e1':
  Build: Add ART_BOOT_IMAGE_EXTRA_ARGS

Change-Id: I98d2311fd4789ea9e31f753b5a2ea09ac605ce00