am c6c46243: am 36f349ac: Merge change Ied29246e into eclair

Merge commit 'c6c462434c17dfbbe3128b2a2804f5d2417ebadb' into eclair-mr2-plus-aosp

* commit 'c6c462434c17dfbbe3128b2a2804f5d2417ebadb':
  Add support for LOCAL_OVERRIDES_PACKAGES to prebuilt build rules.