Merge "AIDEGen: Build the module_bp_java_deps.json every time except -s"
am: 9a60be68dd

Change-Id: I77d854cc447a8f4b7034690e5248b307a5c69f8b