Fix -Lmakefile LOCAL_JAVA_LIBRARIES does not include hierarchy.
am: 40a373da8b

Change-Id: I9ceb0f401263b3974ae826bf4ba9c8eea2c48192