Merge "Suppressing warnings during build of Doclava" am: badd1661de

Change-Id: Idcf5baa2cc5b483519c370dacf337c17c0a5cf4e