Merge "Add LOCAL_JAR_PROCESSOR" am: 9f52f0d17d
am: abcbe9ab86

Change-Id: Ibf50a9ccf5fc4ffd9c2197c2c876eb9718fafe3d