am 6ef58be7: Merge from AOSP

# By Chih-Wei Huang
# Via Chih-Wei Huang (1) and others
* commit '6ef58be7db451bb911c8f41b0ab5aa33d5defb18':
  Remove unnecessary lines in PRODUCT_PACKAGES