Automatic translation import

Change-Id: I911a061c135bb9efda906b199d90baa944d149ff
Fix the previous fix

Yeah, we kinda want the source to be built, so use the right macro
to get the files :)

Change-Id: I05de7efd9c242ac7d96f83367197b49691bc5315
Merge "Fix the previous fix" into cm-11.0
Merge remote-tracking branch 'cm/cm-11.0' into HEAD