Merge "Fix LOCAL_MODULE_CLASS." am: 7467a54e29
am: d92d484537

Change-Id: I682a37052b98600dabde9fe6f4e547c7f8a79f2b