Fix PRODUCT_MANIFEST_FILES am: 64c79297d2 am: 9136bc9ef7

Change-Id: I1d9856f749a97c9eb957080800413fb03273a00e