Merge "Add targets for building individual modules using javac" am: cb6f7c2d86 am: da3fdebc1d
am: d8d5065b50

Change-Id: Ie5364d8135f2e1523b52069a5bcc28be144dfe37