Merge "Fix LOCAL_JAR_PROCESSOR dependency" am: 126e625fed am: 06f8dec6e0
am: 453fcba264

Change-Id: If63096b530ba19c62db7afd95f4d9620cc5fccfd