Merge "Fix LOCAL_MODULE_CLASS."
am: 7467a54e29

Change-Id: I9842f0819a4f964085928b9ce5c7c49335b4cca3